From: Richard M. Stallman <rms@gnu.org>
Date: Tue, 9 Oct 2007 01:39:13 +0000 (+0000)
Subject: (internal_condition_case_2, internal_condition_case_1)
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~26614
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=0f1947abae6af6bd9ab3e59f4deae0cdc24ab43a;p=emacs.git

(internal_condition_case_2, internal_condition_case_1)
(internal_condition_case): Reenable abort if x_catching_errors (),
to see if that really happens and why.
---

diff --git a/src/eval.c b/src/eval.c
index 03923d815aa..8a499ec3851 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -1462,11 +1462,9 @@ internal_condition_case (bfun, handlers, hfun)
 
   /* Since Fsignal will close off all calls to x_catch_errors,
      we will get the wrong results if some are not closed now.  */
-#if 0 /* Fsignal doesn't do that anymore.  --lorentey  */
 #if HAVE_X_WINDOWS
   if (x_catching_errors ())
     abort ();
-#endif
 #endif
 
   c.tag = Qnil;
@@ -1512,11 +1510,9 @@ internal_condition_case_1 (bfun, arg, handlers, hfun)
 
   /* Since Fsignal will close off all calls to x_catch_errors,
      we will get the wrong results if some are not closed now.  */
-#if 0 /* Fsignal doesn't do that anymore.  --lorentey  */
 #if HAVE_X_WINDOWS
   if (x_catching_errors ())
     abort ();
-#endif
 #endif
 
   c.tag = Qnil;
@@ -1565,11 +1561,9 @@ internal_condition_case_2 (bfun, nargs, args, handlers, hfun)
 
   /* Since Fsignal will close off all calls to x_catch_errors,
      we will get the wrong results if some are not closed now.  */
-#if 0 /* Fsignal doesn't do that anymore.  --lorentey  */
 #if HAVE_X_WINDOWS
   if (x_catching_errors ())
     abort ();
-#endif
 #endif
 
   c.tag = Qnil;